Merge
authorAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 17:42:39 +0000 (17:42 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 17:42:39 +0000 (17:42 +0000)

Trivial merge